Merge tag 'emacs-25.1' into deb/emacs25/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Mon, 26 Sep 2016 21:13:06 +0000 (16:13 -0500)
committerRob Browning <rlb@defaultvalue.org>
Mon, 26 Sep 2016 21:13:06 +0000 (16:13 -0500)
commitd3e6b8a251634ad673242aaa4a298edbb2e8ee39
tree3e2ddb6343ac8409639b1c9a11362b671f1745d5
parent62bc68f777c532a970566625e315d68bf0ab4eee
parentf0eb70d8935be90f7c03e187c12d9b60e7214cc6
Merge tag 'emacs-25.1' into deb/emacs25/d/sid/upstream